uradvd: Update to 2025-08-16

Provide four new options:
--valid-lifetime
--preferred-lifetime
--max-router-adv-interval
--min-router-adv-interval

Signed-off-by: Jan-Niklas Burfeind <[email protected]>
(cherry picked from commit b2f14a5e8dc963a77d9292af7332af08973a9ba8)

diff --git a/net/uradvd/Makefile b/net/uradvd/Makefile
index 696cd112ea50c7896f34a3473fa5d99020fedf03..fd63aaf3e5a36a7b9a63d63c8d20402997e5a8e4 100644 (file)
--- a/net/uradvd/Makefile
+++ b/net/uradvd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uradvd
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/freifunk-gluon/uradvd.git
-PKG_SOURCE_DATE:=2021-09-14
-PKG_SOURCE_VERSION:=9b0da60e27c67305d251b10163e388191d566d7a
-PKG_MIRROR_HASH:=84221d0044dd1e622b26ace7cb316be613d3c863293379d551d2c5c280124ddb
+PKG_SOURCE_DATE:=2025-08-16
+PKG_SOURCE_VERSION:=b37524dfb0292c425fd61f5bffb3101fb1979264
+PKG_MIRROR_HASH:=1f681e2baf6f9b825668aeed9c075f532db509d7d1848e76f3e8101acf2bd476
 
 PKG_MAINTAINER:=Moritz Warning <[email protected]>
 PKG_LICENSE:=BSD-2-Clause

diff --git a/net/uradvd/files/uradvd.config b/net/uradvd/files/uradvd.config
index aa5486de30072fe17dae60044afcf50c5339396c..924b7490745ef0cc5f0902b4b11e53ca8462c3e8 100644 (file)
--- a/net/uradvd/files/uradvd.config
+++ b/net/uradvd/files/uradvd.config
@@ -5,7 +5,11 @@ config interface
        # alternative: option device 'lan'
        option ifname 'br-lan'
        # lifetime of the default route (in seconds)
-       option default_lifetime '0'
+       # option default_lifetime '0'
+       # option valid_lifetime '86400'
+       # option preferred_lifetime '14400'
+       # option max_router_adv_interval '600'
+       # option min_router_adv_interval '200'
        list prefix_on_link '300::/64'
        list prefix_off_link '200::/64'
        list dns '2001:4860:4860::8888'

diff --git a/net/uradvd/files/uradvd.init b/net/uradvd/files/uradvd.init
index a80b6ed1d5feae134a2020af73c76e14f3a1b187..81a6b1e5927e215ab320e42dc7cc9c90a365069a 100755 (executable)
--- a/net/uradvd/files/uradvd.init
+++ b/net/uradvd/files/uradvd.init
@@ -17,7 +17,7 @@ append_dns() {
 }
 
 start_instance() {
-       local cfg="$1" enabled device ifname default_lifetime
+       local cfg="$1" enabled device ifname default_lifetime valid_lifetime preferred_lifetime max_router_adv_interval min_router_adv_interval
 
        ARGS=""
 
@@ -25,6 +25,10 @@ start_instance() {
        config_get device $cfg 'device'
        config_get ifname $cfg 'ifname'
        config_get default_lifetime $cfg 'default_lifetime'
+       config_get valid_lifetime $cfg 'valid_lifetime'
+       config_get preferred_lifetime $cfg 'preferred_lifetime'
+       config_get max_router_adv_interval $cfg 'max_router_adv_interval'
+       config_get min_router_adv_interval $cfg 'min_router_adv_interval'
 
        if [ "$enabled" != "1" ]; then
                exit 0
@@ -53,6 +57,22 @@ start_instance() {
                ARGS="$ARGS --default-lifetime $default_lifetime"
        fi
 
+       if [ -n "$valid_lifetime" ]; then
+               ARGS="$ARGS --valid-lifetime $valid_lifetime"
+       fi
+
+       if [ -n "$preferred_lifetime" ]; then
+               ARGS="$ARGS --preferred-lifetime $preferred_lifetime"
+       fi
+
+       if [ -n "$max_router_adv_interval" ]; then
+               ARGS="$ARGS --max-router-adv-interval $max_router_adv_interval"
+       fi
+
+       if [ -n "$min_router_adv_interval" ]; then
+               ARGS="$ARGS --min-router-adv-interval $min_router_adv_interval"
+       fi
+
        ARGS="$ARGS -i $ifname"